More or less finished the conflicts page, waiting on some functionality before it's completely done.