chore: resolve conflicts