Dropped some unnecessary comments
Fixed merge conflicts