Fixed git conflict in examples.erb