styling changes
fixing merge issues