Initial commit
Merge conflicts fixed