Merge/graphics change