fix merge for 1.1.6