merge most of the various branches out there together