attempted to apply to selected and apply to all but failed
merged conflicts