inserted some fantastic new results
resolved said conflicts