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