fixes #12

Adds the strategy flag. Hopefully this fixes the "merge conflict" messages coming from Jenkins.