Added migration. Added gallery
Merge conflict fix