First commit
Fixed merge conflict