@Nan-Zhang this is a merge conflict that you've committed, not a syntax error.  Any time you merge, you need to resolve conflicts *before* you commit that merge.  Otherwise, the "merge" actually spans multiple commits!