adds copyConflictedFile method to LocalFileManager class
Merge origin/master