kyracq merge fix