Fixing up my merging mess