pull  and merge