I agree tension has died down. But I have no doubt chinese asic miners will hold their ground. Even if a compromise is met the asic miners will get some benefit and lead the coin further down to

China keeps loving bitcoin. To some degree they are xenophobic of foreign technology companies (ie Facebook is baned and zuckberg failed an attempt to have the chinese president name his daughter). It