rm conflicts
resolved conflict
Merge branch 'master' of github.com:jordpo/karmaforge