lagaði compile villu, merge conflict inní main falli