trying to fix merge
fixing merge step2