Initial commit
Fixing the merge conflict issue