Fixed last conflict issues/comment box added