remove merge conflict

Cannot complie it. Fix it now.