merge fix

fix some merge issues