fix conflict migration
Assign current_user to the instance
Merge pull request #32 from fachriza/master

fix conflict migration