Conflicts are shown, only solving not working
Merge branch 'master' of github.com:hhagmans/Ticket-Boys