modify to create conflict