Add proper content finder

Signed-off-by: Yury Tsarev <ytsarev@suse.com>
Add basic merging implementation

Signed-off-by: Yury Tsarev <ytsarev@suse.com>