set timestamps as last step
fix merge conflict in common
fix memory corruption error in string bcast