fig merge bug and typo in render()