merge-conflict.md

merge conflict

On using git merge we see merge-conflict due to equations.txt
We edit the file to 2 + 3 = 5
Then use git add equations.txt and git commit -m "ok" to resolve the issue.