just pulled before
Merge remote-tracking branch 'origin'
on top of zoltan