fetch no merge,pull merge

fetch no merge,pull merge