Search "merge conflicts" - Agent Skills | skills.rest