bim --> bam
commit
commit
commit
m

m
a

a
resolve
Merge branch 'master' of https://github.com/jonasoesch/NRJ