adding rails bundle
Resolving conflicts