fixed merge crap in Comment.java