Fixing up the merge