First commit on branch 1
Merge conflicts resolved.