editing views
merging conflicts
modified css, improved profile with guess history