rewrited hhoks file to test
resolving conflicts