Merge works fine now
Hotfix