Hotfix/self merge problem fix

:P