merge after added in conflict