added to conflict