auth controller login features
fix merge conflicts