admin merge fix