Working on getting style to merge properly