merge with 2.6