Delete git added text after conflict resolution