Hotfix
Resolves merge