ok, let's merge it this way and do it separately