rename changeset because of conflict