added basic conflict view