Initial commit
Merge conflict res