Merging without Git! Oh noes!