Remove merge conflict.
Remove merge conflicts.
Fix typo