addComment is working
merged conflicts