beginning of custom tool pallet
fixing merge