Fixing up some git merging stuff