removed .close() statements
resolved merge conflicts