fixed merge poop