Fix: Merge migrations file to resolve conflicts
Fix: Merge migrations file to resolve conflicts

lapo-luchini/pinry,pinry/pinry,pinry/pinry,pinry/pinry,lapo-luchini/pinry,pinry/pinry,lapo-luchini/pinry,lapo-luchini/pinry