login features
merge fix