fix september conflicts