merge actions, instead of shadowing, fixes #6