Rails new project.
Resolve conflict.