Fixed merging bug and color not changing when pop split
Fixed merge bugs and splitting pop changes colors correctly