totally fucked this up
merge fixed