Merge my inspector changes