Fixes merge problems