Git merge diff3