Master conflicting change
red change on feature branch
merge