initial styling with merge changes