batch
conflict resolved
batch add and list completed