The definition of “define/merge conflicts” is written on demand for people. Open this page in a browser to read it.