Fixing the merge problem