push
push
push
Merge remote-tracking branch 'origin/Adam' into Jody
try this