Fix merge conflict in people page