Use mapping.
GitHub edit merge conflict.