Initial commit (2)
Fixed merge conflicts