Fixed undefined property $filenames error in Repo::mergeConflicts()