Removed typo
Fixed merge conflict