Merge button fixes