merge with openhevc