Hotfix: conflict solved