seperate pull and merge