Rails installation
Conflict resolved