merge conflict for time-estimate