conf

Pull request with a conflict.