locking down the conflicts page