fixed conflicting migration