update git behaviour for merges