Removing dup fn from conflict