Initial commit
Conflicts solved