Overwrite Conflict Change history