corrected typo
fix conflict