more style shit
fixed merged errors