current user logic functional
fixed curious merge error