[Bug] Fix the issue when merge remote changes