Changing the estimate report logic
Resolving merge