make sure we can easily come back before merging serverpath