A computer system for easily fixing a generated conflict, and a method thereof are provided. This computer system includes a CD-ROM for fixing a conflict, and a control unit. The control unit includes a state information recording portion for collecting state information on the computer system and recording the collected information in the auxiliary memory, a conflict sensing portion for sensing a general protection fault, a system registry fault, and a system hardware information abnormality when the computer system operates, and reporting the sensed faults to a user via the input output device, a state diagnosis portion for diagnosing the presence or absence of abnormality in the computer system according to a user's instruction, attempting to fix the abnormality using diagnosed contents when the abnormality is sensed, and reporting to the user via the input output device abnormality incapable of being fixed by the diagnosed contents, and an existing state reverting portion for reverting the computer system to a state when state information selected by the user among state information recorded in the state information database was produced. Accordingly, a conflict generated on a personal computer system can be easily cured. When an unrepairable conflict occurs, the computer system with the conflict can easily revert to a previous state using existing state information. Also, when a serious conflict is generated on the auxiliary memory unit including a hard disk device, the conflict can be easily repaired by image files recorded in the CD-ROM.