[Bug 991155] New: File conflict updating gsl