incorrect change for creating conflict