Added a test case for debug_error_message()
Resolved dumb conflict