Added support for conflicting files in the repository