Fix Messy Merge