fixed login merge error