Adding a line in the temp copy
Fixed the conflicts