small adjustment to merge