set timestamps as last step
fix merge conflict in common