Create conflict.md