Fixed Conflicting Methods in MCH after Merge with J.O