Normal update, how to resolve conflicts