Conflict is a situation when both the commits that need to be merged have changes at the same place. This often confuses the software which change should be taken into consideration and which one should be neglected. The best manner to solve this concern is to simply edit the files through the appropriate procedure.