fix conflicts in mig