merge login fixed