there was still a problem with the file, didn't resolve the conflict tight. Nos it's ok.