readding users after merge with upstream