Merge finally done