Fixed the last merge conflicts.