Iniitial commit
Fixed merge conflict