First commit
Solved merge