Worked on conflict method, fixed and re-ran migrations.