changed conn
resolved merge conflicts