Fixed someone's merge shenanigans