add comments and posts dependency
resolve conflicts