removed the Git thingies from merge