removing trailing git conflict