Add alliance + search alliance + design things
fix conflicts