both sides changed

let's now try to merge them!