bad git rm resolved