editin rus.md
resolved conflicts