fix lack of common ancestor, and base things off of `develop`