modifications to merge