resolve conflicts
conflicts