Init project:
my rails sample init
merge conflicts fixed