cleaned up merged files