standardized error messages
resolved merge conflicts