modify master in locol
merge