git cofnie comfrited scal

git merge --abort
Tense Trout