fix merge plugin
Merge pull request #29 from lifey/master

fix merge plugin