Fixed the rest of the merge bugs.