Note from Remerge: The refactor diff can be found here. This diff shows how we refactored this example to use Remerge.