Update conflict.std