comments are now correctly merged with feedbacks