Initial commit
Conflicts resolved