bundle install
add the brails screen design file.
resolve the conflict.