modified files that could cause merge conflicts