Fixed a comment
Fixed merge conflict