fixup! merged /usr config
