update stamp
fix conflict