error is ok
M erge branch 'master' of git://github.com/afein/pps