check merge

After merging just one thing appear is change of the
if (attrList) {} in alcCreateContext … not a big deal this pull request
is not necessary