resolve merge conflicts - congrats git
add further parts of game theoretical model - needs derivation