fixed surrender bug, i think
conflict