Bugfix comment routing error.
Resolve merge conflict in comments controller.