Fixes merge