removed git conflict thingies
removed git conflict thingies