tried to do the merging ... not sure everything went fine :)