improve merge popup and commands