Add to conflict-file
Resolve conflict-file