removed text shadow
 merge conflicts fix