fixed merge request issues and killed double color picker