Comments fixed
Fixed conflicts