re-merge with removing extra files