basic pull and merge working