removed conflicting dir