Fix merge conflicts.