update merge errors
Merge pull request #62 from toannguyenle/rails_toan

update merge errors