configured Oliver's merge