expecting merge conflict
main_hair_style_saloon
index.html reset to default