removed git conflict messages