fixing premature merge