fixed merge stuff in Comment.java