fix merge controller bug
Merge branch 'master' of github.com:tillreiter/pleasetakeit