TINYGL: Merged conflicts