did part 1
merge