data_source_log table attributes
Clean up description displays
Fix merge conflict