Ignore conflicts?