merging local style changes with functionality changes made in store