Update supervisor_error.log
Fix conflicts