resolving a file that didn't get merged properly