After merge fix