Fix merge issue I somehow committed