resume updates
resume conflict resolution