Fixed more small merge conflicts.