conflict dammti
Fixed merge conflcits
fixed merge conflicts for real?