Revert "Typo"

This reverts commit b9ef85cc0197c19bb766164fbde878ceb723d6bd.
conflicts fixed
Conflicts fixed again again....