there is a conflicting migration in 2-1-stable branche 

See 8de75a5d3d519c5498843edda983702852caaade