first draft
conflicts merged