adding details activity
fixing conflicts