Fixed auto-merge conflicts.