login activity progress
merge