First commit
Fix merge conflicts