weekend changes
fixed feed show view conflict