data
all data
conflict
resolve conflicts