Corrected bad merge conflict of previous commit