traiko edited file vasko
fixed conflict - accepted vasko_s file
change file
vasko merge
fixed conflict