added people discussing
fixed merge conflict with categories/index