Typo
Merge conflicts fixed