fixed fuK*n merge