Enhanced debugging output
Merge conflict fixed