Handle merge conflicts better; record migration names