solve conflict
solve conflict
small change and NASA estimator