merge before rebase
 merge before pull fixed conflict
Merge pull request #2 from adamilardi/merge

Merge before the pull