Pretty sure I fixed the merge issues. It runs on my machine.