Graphics: Fix a merge issue