Fixed error caused by common 3.0 merge fail