vasko edited file vasko
fixed conflict - accepted vasko_s file