Fixed a bad merge :/