4.0 structure
local merge remote, pull merge add commit