Merge fixing