userData from firebase
resolve merge conflicts
removed test file, sync up