Added flag for internal time
fixed conflict
fixed conflict