Delete simple.rb
Add simple ruby
Document the function
Add merge abort
Manual file re-merging notes
Advanced merging notes