updating method to keep upstream-edge at edge, and remove old git
aliases