silly conflicting change example