login merge fix