merge with dror