Resolving MATRIX subdirectory conflict