Fix typo
Fix conflict