add a change that should be easy for a merge tool to pick