Init.
Fixed conflicts