added detailed conflicts page