Added but with conflict