merged gemfile
merged new controller name
;