finishes merging conflicts between migrations