Fix minor bug in merging files

In !992 (merged) I broke the merge result feature here. This fixes that and standardizes the naming of the result variable.