fix merge crud
Merge pull request #4 from xsleonard/master

fix merge crud