post merge fix