Double conflict creating when there is no unsolved conflict in this
week.
Fix for holiday creating after creating conflicts
Merge branch 'master' of github.com:hhagmans/Ticket-Boys