First commit
Conflicts resolved.