update
merge + update + conflict resolve