Added hotfix
:x
Fixed conflicts