Fixing the merges