Update conflict.md