Tag: steps for better conflict resolution