Got it to run
Merge remote-tracking branch 'origin/master'
Fixed Faces.plist