updates and conflicts