pull master
merge by meld in master