merge/ diff Kriss et sky files

merge/ diff Kriss et sky files