fixed current_user bug
fix merge conflicts