Britvik zeler sivak merge gabika

To fix merge error