Vim shit
conflict
Resolve conflict