awesome css-ing
fixed merge conflict in store.php and updated css