fix merge conflict'
fix merge conflict
fix merge conflict
fix merge conflicts
include comments and authenticate user method
turn shw partial into regular view page