rgba change
fix some conflicts