Parsing date time on mama.rb
Fixing this merge conflict