Fixed error while merging file Comment.java, sorry!