i have done the merge discussion