Fix up merging issues