merge - hopefully complete ...