made a change in testing branch
Undo commit
made a change in master branch
Merge sa testing
Rešavanje merge conflict