Changes with merged solutions