merge and added getCurrent user