< to quote
with lots of debugging output
refactored debugging log to separate file
merged trivial conflict