alliance fix
merge