Initial commit
Fixed conflicts