log in after button click
merge resolve