More polishing
Fixed merge