Questions - merge-conflict-resolution