Pri commit-u v git repozitorij si dobil konflikt. [Preberi si o tem](http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository) in popravi.