merge with stable