hero update
resolve conflicts