Manual Domain Conflict Resolution