finnaly fixed merge connflict in funcbodyvisitor