FIX GG_MERGE
Merge pull request #46 from pmouawad/GG_FIX_MERGE

FIX GG_MERGE