merge prep
fix merge issue