fix merge changes