fix merge error in thoughts