shell coverage support
fix merge conflicts