formatted show details view better
resolve conflicts