fix migration conflict
fix migration conflict

ayushagrawal288/zamboni,washort/zamboni,ddurst/zamboni,washort/zamboni,elysium001/zamboni,elysium001/zamboni,ingenioustechie/zamboni,mozilla/zamboni,elysium001/zamboni,shahbaz17/zamboni,shahbaz17/zamboni,mozilla/zamboni,ayushagrawal288/zamboni,ingenioustechie/zamboni,tsl143/zamboni,elysium001/zamboni,luckylavish/zamboni,jamesthechamp/zamboni,jasonthomas/zamboni,shahbaz17/zamboni,ddurst/zamboni,luckylavish/zamboni,jamesthechamp/zamboni,mozilla/zamboni,diox/zamboni,ddurst/zamboni,jamesthechamp/zamboni,washort/zamboni,tsl143/zamboni,mozilla/zamboni,ddurst/zamboni,jasonthomas/zamboni,diox/zamboni,jamesthechamp/zamboni,jasonthomas/zamboni,ayushagrawal288/zamboni,tsl143/zamboni,ingenioustechie/zamboni,ingenioustechie/zamboni,luckylavish/zamboni,shahbaz17/zamboni,diox/zamboni,ayushagrawal288/zamboni,tsl143/zamboni,jasonthomas/zamboni,washort/zamboni,diox/zamboni,luckylavish/zamboni