changing file, creating conflict