Merge pull request microsoft#184603 from kevalmiistry/complete-merge-issue

FIX: conflict actions bar overlapping Complete Merge button fixed

Author: hediet

src/vs/workbench/browser/codeeditor.ts

@@ -153,6 +153,7 @@ export class FloatingClickWidget extends Widget implements IOverlayWidget {
 		this._domNode.style.padding = '6px 11px';
 		this._domNode.style.borderRadius = '2px';
 		this._domNode.style.cursor = 'pointer';
+		this._domNode.style.zIndex = '1';
 
 		if (keyBindingAction) {
 			const keybinding = keybindingService.lookupKeybinding(keyBindingAction);