misc merge