added computation log time....
resolving conflicts