Add to conflict-file
Conflict with remote pull resolved