[Bug 991155] File conflict updating gsl