Wrap turn resolution in a transaction
Merge branch 'master' of github.com:Neamar/corporate
Fix build