fix merge conflict

Keyword Analysis

Keyword	CPC	PCC	Volume	Score	Length of keyword
fix merge conflict	0.91	0.3	561	88	18
fix	0.6	0.2	8573	73	3
merge	0.18	1	4791	70	5
conflict	0.04	0.9	8214	92	8

Keyword	CPC	PCC	Volume	Score
fix merge conflict git	1.45	0.5	2676	34
fix merge conflicts	0.81	0.9	6291	22
fix merge conflicts github	0.09	0.9	3028	85
fix merge conflict vscode	1.9	0.1	2402	18
fix merge conflict azure devops	1.56	1	724	74
fix merge conflicts intellij	1.33	0.1	7714	20
fix merge conflict bitbucket	1.06	0.4	7373	100
fix merge conflicts visual studio	1.69	0.1	1031	80
fix merge conflicts git command line	0.52	0.5	3096	85
automatic merge failed fix conflicts	0.64	1	2718	35
git fix merge conflicts	0.27	0.5	7163	18
azure devops fix merge conflicts	1.38	0.6	9283	68
how to fix a merge conflict	0.92	0.3	4575	20
fix merge conflict git bash	1.98	0.8	1152	12
git fix merge conflict in pull request	1.46	0.5	8088	89
git fix merge conflict command line	0.93	0.5	3334	35
fix merge conflicts git	0.41	0.4	13	93
fix merge conflicts in azure devops	1.9	0.6	7033	85
fix merge conflicts bitbucket	0.04	0.8	1527	2
fix merge conflicts vscode	0.09	0.2	4159	12
fix merge conflicts devops	1.89	0.9	6038	50
fix merge conflicts locally	1.49	0.3	3513	94
fix merge conflicts visual studio code	1.96	0.7	4183	36
fix merge conflicts command line	0.34	0.9	3569	15
git automatic merge failed fix conflicts	0.55	0.5	389	25