First commit
Solved merge conflict