fixed application.erb
merging