merged error is now fixed