Fixed a bad merge earlier