Fixed Merge Poop