removed git conflict thingies