pi-checkin update

slight change - readded merge if settings.plist does not exist.