winter is coming
added changes-removed conflic