Merging functionality added, rough round the corners.