user data in sidebar functionality is complete
resolve merge conflicts