merge master
input button edit for tsak
merge conflict slove
solved merge conflicts