Added git merge diff3