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

update merge errors