fixed merge conflict
Mergg branch 'master' of https://github.com/fueledbymarvin/localflows