don't log sql
resolved merge conflict