Fixed migrations conflict