Changes to custom for better viewing. Update GAModifier
Merging conflict resolution