removing extra files after auto merge