removed field estimate and fix
merge