v1.0.0 - resolve-merge-conflict | verified-skill.com | vSkill