fix changes of gort in the artoo site
Fixing conflicts