files with merge conflict

[stevenhwu]

There are two files in fix_merge_conflict with merge conflict. Try to address them with some sort of difftools.
VS Code has a basic build in one for to you compare these two different versions.
My personal favour is kdiff3, but it's pretty old at this point.