update edit function
Deal with conflict