BUG: fix the merge