Update thing show
Solve merge