update ui
resolve conflicts