fixed a migration conflict in this file