Conflict Analysis & Resolution:Files