fixes merge problems