fixes merge shit