merge forward -s ours: "removing parts that should be just in
admin_cards now"