added let-to-fn
conflicts