Fixed Comments
Fixed conflicts