Complete the merged functionality