Part 1 of manual merge w/ danny-milestone4