---
title: Improve visibility of "Resolve conflicts" and "Merge locally" actions
merge_request: 8229
author: