Update katzkklab.txt
resolve conflict
Merge branch 'kk'