Merge. Replace promise with when