Fix WatchSet.merge to actually merge files.

Not sure why this was commented out?
Remove outdated comment