Resolved merge conflicts

:q

conn/codec_test.go

conn/pool.go

query/query.go

query/query_test.go

server/main.go

server/main_test.go

worker/worker.go

worker/worker_test.go