patching openair
additional changes, trying to solve conflicts