getting my branches back in order