issue listing screen and issue details screen
add issue conflict resolved