added views for comments
fix conflict