Fixed a bad merge commit