test conflict on/off line
merge t, use offline