Re-Worked Conflict Handeling