fixed some typo
fix conflicts