Merge pull and modified the text color