remove git conflict chevrons