More styling, removed leftover merge info