Remove unnamed people
Fix conflicts