commit

fix merge issues