cleanup git conflict on damage trash