merge settings into orca 5