Conflict Analysis & Resolution: Clean & add info for the professor