restore bad merge changes: be precise about which file to look