Update including explicit steps to resolve conflicts.