Update gh2
Making changes
Fixing two conflict