resolve clobbered files from last merge