Getting exception while bundle update

code was conflict, must be fine now.