Audit task, exec, general added
conflict resolved, data deleted