[Initial commit
[MERGE] Fixing merge conflict