Audit Table Entry completed
Conflict resolved