path update, composer update, git fix to work with diffmerge