article accept changes, event list changes
merged, resolving conflicts