added current_user
fixed merge conflicts for current_user