Fixing the duplicate directories
Fixin the merge conflicts with xsolving directory duplicates