Fixed Typo
Fixed merge conflict