This is the practice for git merge conflict for cs369.