i'll merge it now if so, or you can