fixed EGL merge problem
merge