fix merge stuff
Merge pull request #42 from airauth/crad

fix merge stuff