moved conflict set resolution