#246 Fix a bug in the merge