deleted and merged files