ignore ff only merge