playground star
fixed merging problem