Possible Fix For Conflict