Fix migration conflict