delete subscriptions when merging users (avoid some potential conflicts)
Merge branch 'master' into prod