Fix bad conflict detection during makemigrations