Fix merge error in inspector.ui