added actual merging functions, working out minor problems with lack of info from gits renamed merge files