Gamma code
Gamma code
fixing merge
fixed all errors