Fixes merge error my bad