trying to fix this merge madness