ok, now merging