solved merge rubbish