Update conflict UI