First commit
Fixed merge conflicts