Merge branch '3-merge-resolvers-into-single-playbook' into 'master'

Resolve "Merge resolvers into single playbook"

Closes #3

See merge request !10
3 jobs for master
in 25 seconds and was queued for 1 second