diagram draft
merge resolved