Turns almost work.
Fixed merge.