fix compiler error on merge