entry updateview
resolve conflicts