rendering and ai merge
merge