Fixing merge fails
Fixes merge