made more comments
resolved conflict