git-merge

<- Icon in Feather