Starts fresh Rails app
Fixes merge conflicts