plist edit to make it generic.
Merge remote-tracking branch 'origin/master'