Remove conflicted file and fix spelling error