Merging completed modifications on Gii generators