resolve commit conflicts