modified to conflict