small merge fix