local commit6
conflict1
local commit8