working towards merging everyones changes across different un-gitted copies