pre-merge fix spec