tree edit
changed the name in the index
resolved artificial conflict