add style suggestions
save my work
fix merge