fix conflict migration