мерге
мерге 2
commit
render partial
merge