catarse merge fix