patching root folder conflict