Update GPL License header
Merge conflict
Merge conflict