Tests pass
merge fixed