Mistake when merging