merged error corrected