Audit log,resolved merge conflict