Merge logic compiles. Is almost certainly wrong.