Merging work and resolving conflicts for @wlmiller