added conflict to show issue view