git tells me to commit
Merge branch 'master' of https://github.com/Groarq/tablica
merge conflict