Fixing merge breaks