I did a Check Project Status and was told which files had been modified by me. The problem is that some of these files have also been modified in the repository. I cannot commit them as the uptodate check fails. You used to indicate which files needed to be merged and which ones would cause conflicts. This functionality must be restored.