fixed syntax error in comments controller
fixed merge conflict