Initial commit
Fix merge conflicts