Python merge use git choosing strategy default