Fix merge and error handling