Fixed style
Fixed conflicts