fix login merge error