support for multilocation files
resolved conflict