Fixing issues with the merge