Fixed merge conflict word.