Fixing directory conflicts