discard conflict both modified: src/classes/PortalComponentStructureJSONTest.cls git reset HEAD src/classes/PortalComponentStructureJSONTest.cls