mods for merge conflict