Fix typo
Fix merge error