There are two types of merging in Git & GitHub. One is automatic merge and another one is manual merge. When automatic merge fails then this error occurs. You can overcome this error by using manual merge. For that you can use mergetools. You can use meld, p4merge as a merge tool.