merge and error handling and receiver updates