pulled updated version and reconciled