Fix conflicting migrations