bootstrap
a
fixed conflicts
merged
fix Gemfile.lock conflict