merge with 1.9.4d