fixes merge