BUGFIX: fix an incorrect automatic merge from bk.