Fix Sarvesh's Merge Conflicts