I changed the file with errors by the corrected file, but I am sorry because I did not notice that there were some conflicts.

Now, I guess the conflicts are solved.

Regards.