Update 12_merge_and_resolve_model_conflict.md

job #1 - Updated link