git clash characters removed