working out some merging issues