changes order of merge_into definition for hotfixes
Hotfix: implement for merge conflicts