Fixing login merge issues