remove ычв files
fix conflict