Fixing merge apparently was broke