slowly getting the conflicts page in order.