Fixing the last of the merge problems (hopefully