Initial Commit
Merge conflict fixed