git Merge made by the recursive strategy