merge fix for shared materials