maybe a fast forward who knows
Merge pull request #4 from adamilardi/merge-after-with-no-conflict

 maybe a fast forward who knows