added new colors
changed the merge icon