fix merge problem
Merge pull request #4883 from wmtan/FixMergeProblems

fix merge problem