Created header
Fixed conflicts