working out issues with merge.