minor changes to merge