Updated Rails version.
Fixed conflicts.