-merge
-remove some old files
-merge