Merge origin

how to merge without commit