Working with the merge for the audit log