v1.0.0 - resolving-merge-conflicts | verified-skill.com | vSkill