style update
fixing merge