# -*- mode: snippet -*-
# name: Merge Conflict Resolution
# key: merge
# contributor: LorestForest
# --
/ask
I'm facing the following merge conflict. How should I resolve it while maintaining the intended functionality of both changes?
${1:conflict details}
