added ignoring of conflicts
Merge branch 'master' of https://github.com/lukolb/gfemessenger