show detail page
resolve conflicts