Fix git-merge framents.

Fix compilation error due to merge fragments.