update theme
resolve conflicts