fsfd
ruby on rails core
fix conflict in readme.md