fixed merge for graphics