remove old data and imply jnb 8kaa's merge