Fixing all merge conflicts.