When trying to merge changes to a remote main branch, a conflict error occurred in the README.md file. I tried to resolve the conflict manually, but was having difficulty getting the solution right.