stylesheet update
resolving merge conflict