Fix merge with connectivity error