fixed login modal
fix merge conflict