to aim confrict
fixed