auto-lock conflicts when scheduling shifts
Merge branch 'master' of github.com:wwit-atl/backstage