Merge

Add merge button