Commit 5acaa592 authored by Okhin's avatar Okhin

Function merge is working

parent 4b6a8a0c