Fixed incomplete merge of GraphicsModel