Discussion Comment and detail screen
Fixed conflict