Resolves merge conflicts
Kept users migration