jansson file resource
conflict merge