First commit
Fixed conflicts