public/assets and public/uploads dir removed
conflicts are resolved