Fixed Merge Conflict

There was a conflict with duplicate migrations. This has been fixed.