resolved conflicts
Added antelope_orb_after config param; defaults to now