A ‘conflict’ in a Git system is said to have arisen when the object commit that was required to be amalgamated has got some modification in one place, along with the current object commit also having a modification at the very same place.