add conflict to origin