local changes
merge
merged