start fixing dif
merge ju