test pull and merge