fixed initial start time
fixed merge conflict