fix automerged files from 3rd merge (really)