user logins and feed subscriptions
merge conflicts