KingIdee merged with remote origin/master