pull and merge