First commit
Fixed merge