fixed application.erb merge error