Fixing Weird Conflicts