Resolved shop model  migrations conflict