remove ryans merge conflict