Fix nationality field
Fix merging conflicts