Error handling
resolved merge conflicts