Another Conflict added