Resolved Merge Conflicts - Sumeet