Fix conflict on migration