Hotfix/merge fail