make history a LITTLE better
fix merge