Adding a line in the temporary copy
fixed the conflicts