Let git always do merge commits