resolve conflicts
resolved]