fixed login
fixed merge probs